From faff1393e46d07146c08018ed37f637a9b3a3e7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Thu, 8 Sep 2005 17:18:43 +0000 Subject: [PATCH] build fixes for check target --- ChangeLog | 2 ++ Makefile.am | 8 ++++---- extensions/Makefile.in | 2 +- tests/Makefile.am | 2 -- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8712a8d..3d755ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-09-08 Øyvind Kolås + * Makefile.am: build extensions before tests. + * extensions/Makefile.in: build extensions when check is done. * tests/Makefile.am: removed erroniously added foo test. 2005-09-08 Øyvind Kolås diff --git a/Makefile.am b/Makefile.am index 9a86a35..beb8374 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,9 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 -SUBDIRS = babl \ - tests \ - docs \ - extensions +SUBDIRS = babl \ + extensions \ + tests \ + docs pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = babl.pc diff --git a/extensions/Makefile.in b/extensions/Makefile.in index 054f163..927c904 100644 --- a/extensions/Makefile.in +++ b/extensions/Makefile.in @@ -53,8 +53,8 @@ distdir: cp $(CFILES) $(Makefile.in) $$distdir dvi: -check: #playing along with automake +check: all .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/tests/Makefile.am b/tests/Makefile.am index b55612c..51bfaf5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,7 +12,6 @@ TESTS = \ conversions \ types \ models \ - foo \ babl_class_name TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions @@ -25,7 +24,6 @@ babl_class_name_SOURCES = babl_class_name.c sanity_SOURCES = sanity.c types_SOURCES = types.c models_SOURCES = models.c -foo_SOURCES = foo.c AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl -- 2.30.2